Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev