Merge "Do not immediately perform traversals when executing transition" into pi-dev am: 09a0c2d53c
am: f8ac1fd83c

Change-Id: I3009c9eae0692c45abd22da5bc2ba9ef855bb96f