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

Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4