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 am: 47088d2de1
am: 7e8be4fcc2

Change-Id: I5f8dceec82b3a6aba93b8c939e21d6276ac83642