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

Change-Id: I60d021055eb5df79c71f74c546994670c8cb9b5b