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

am: e11e076fed

Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
This commit is contained in:
Phil Weaver
2017-07-18 20:51:15 +00:00
committed by android-build-merger

Diff Content Not Available