ROMControl: Fix a couple of merge mistakes

Change-Id: I19b34c0829b3af6adffa3b5464528463dbad91d0