tree 6a1d955b1c9e9080b9cd59faafa25f64094e32c6
parent e7f5c6aa38b0e5ba9c5dab036688a5817cec7a55
parent f75d22dcc0833bf25c95a11031c7923f9bff096f
author Phil Weaver <pweaver@google.com> 1499901721 +0000
committer android-build-merger <android-build-merger@google.com> 1499901721 +0000

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c am: 26e98edf31
am: f75d22dcc0

Change-Id: I694a91cbbfbe0590bfe87df52c7a2aad9ceaedfa