tree a0e4fb17fed7b75d83cfaf96f2824d6701b8bcca
parent b968d99e3eae0ccd56b6fab2cc95966f1c8f70a3
parent f44b48acae28704eb42569b871fe3b237177b698
author Phil Weaver <pweaver@google.com> 1500412180 +0000
committer android-build-merger <android-build-merger@google.com> 1500412180 +0000

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

Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad