tree a0e4fb17fed7b75d83cfaf96f2824d6701b8bcca
parent bb89a1e3fe31f0b4d25f56b0e2b0245c6ce78f1b
parent 83261a8b5c5f5a5ede328d3b6786688e9c97cb29
author Phil Weaver <pweaver@google.com> 1500411589 +0000
committer android-build-merger <android-build-merger@google.com> 1500411589 +0000

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

Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8