Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e
am: ba46064323
Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6
This commit is contained in: