tree 221667abd9589d48a886de65263138b0ab366282
parent 88e9aa19e206f2e9f9515f4f7d082441699adf26
parent 26e98edf311db9045aa26bd292b3abb694dc45e6
author Phil Weaver <pweaver@google.com> 1499901337 +0000
committer android-build-merger <android-build-merger@google.com> 1499901337 +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

Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3