Merge "Fix sanitizer in handleTransitionLocked." am: 66d9ea6345 am: 201a44a961
am: 75abadc9c9  -s ours

Change-Id: I472cc480284e8d0bd7b94475634639351d40543a