DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53c -s ours am: ff115bff am: ccbac7e9 -s ours am: 76007bb2 am: 219d9b5d Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623