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

Change-Id: I7a2ef4e014e3e25b2b2dd9dcb045cfa4fa311a4b