DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1

am: ccbac7e9e0  -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37
This commit is contained in:
Phil Weaver
2017-07-18 20:28:22 +00:00
committed by android-build-merger

Diff Content Not Available