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