tree 6b831d14d8195e8ed5fc93256e5d4a5f43fb72ae
parent cba64fb4614ff9c1716f3ed40c67f80edaed4855
parent e11e076fed54c78491910a5d3786430f7418c061
author Phil Weaver <pweaver@google.com> 1500411075 +0000
committer android-build-merger <android-build-merger@google.com> 1500411075 +0000

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e
am: e11e076fed

Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5