Updated the RomLatch to be 5 bits in several places

Change-Id: I4aab0fc4f4a0fbccd4779d2b53d1cd266ed2f118