DO NOT MERGE Back-port fixes for b/62196835

am: 24fdc53cfe  -s ours

Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476
This commit is contained in:
Phil Weaver
2017-07-18 18:26:57 +00:00
committed by android-build-merger

Diff Content Not Available