Merge "Import fixes from an internal repo." into lmp-dev