ROMControl tracking

Change-Id: I1c2beadf10f0432f38ffbe6fb985df3908c82eb7