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

Change-Id: I5f4dd5ff7fdfc4c3c54c6dffd0aff4d7bddeafda