Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5 am: d761dad216
am: a81076b2e8

Change-Id: I1601d89e5c39e68361b03dff475f312d0e7fc22e