Commits
Paul Jensen authored and Gerrit - the friendly Code Review server committed dd6777904d7
Fix build break due to automerge of 7d2198b5 Bug: 30100884 Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f (cherry picked from commit baae57ab24db7d3b0bf7f84c05954173f1ee15fe) (cherry picked from commit 31f351160cdfd9dbe9919682ebe41bde3bcf91c6)