DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours
am: ff115bffb1

Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70