Merge "Fix some change-transition issues and tests" into rvc-dev am: e46216285b am: d055f1d9f8

Change-Id: Ib690286217fda411564c41f331e4f343d899ec24