Merge "ADD owners to compat framework code." am: 2bbb78b5c0 am: 9f074ee036 am: fc581db1d6
am: ca6ea8ffdd

Change-Id: Ia7dd0e8767f9f652b01aaaf319c36e06c41db512