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

Change-Id: Ie6265d10cd5699a0a37f180cd66c6f15d66884fa