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

* commit 'b249fdd553dbe82a85917b1520ad5e3a59b01d17':
  Removing differences between AOSP and internal