Back-port fixes for b/62196835 am: 5bdffc5d57

am: 5a7eb970e2  -s ours

Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e
This commit is contained in:
Phil Weaver
2017-07-12 21:55:31 +00:00
committed by android-build-merger

Diff Content Not Available