Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970 -s ours am:...

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870
am: bb89a1e3

Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340