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

Change-Id: I5f89a8141ec57c153fb798cf368f02ecbe2dbbdf