track own ROMControl

Change-Id: I24c098917ca2f4e62426cbed7d010a80e14db690
Merge "track own ROMControl" into kitkat