Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e
am: 37cf6265db -s ours
Change-Id: I28f848331e5379736dd777995fe844aa5c5df689
This commit is contained in: