Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84

am: ba928bd522

Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9
This commit is contained in:
Phil Weaver
2017-07-12 22:06:27 +00:00
committed by android-build-merger

Diff Content Not Available