Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94
am: 7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
This commit is contained in: