Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
am: f433884a84
Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297
This commit is contained in:
5bdffc5d57 am: 5a7eb970e2 -s ours
am: f433884a84
Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297