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

Change-Id: I65f45f8f979765def9ba1c7f56d1a3dee3292b0f