Merge "Fix RegType invariant checks."
am: bdaa613753

Change-Id: I8a8e669c0a5c7b8acaf1a6034d5a379972fc64b0