tree cfd7eb33b90071ff7d8f06a3345f166a8d837499
parent e06843fe7eba3e97614afbc6ffd33496bd623caa
parent 76007bb240078a52f9089c7b4d78fb8bea39f972
author Phil Weaver <pweaver@google.com> 1500410323 +0000
committer android-build-merger <android-build-merger@google.com> 1500410323 +0000

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

Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2