tree f69289abb8881a0cb99d5f94dbecb729e5a3adc6
parent a6e0a6e31d35551104f2e72c401ae910a5de8e07
parent e06843fe7eba3e97614afbc6ffd33496bd623caa
author Phil Weaver <pweaver@google.com> 1500410643 +0000
committer android-build-merger <android-build-merger@google.com> 1500410643 +0000

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5
am: e06843fe7e

Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2