Merge "Removing differences between AOSP and internal" into lmp-dev