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

Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad