Merge "Fix RegType invariant checks." am: bdaa613753 am: c08ebd6cbc
am: d3015313de

Change-Id: Id7a74b7deb25c18fff7962da85c72eaf8fba079a