Merge "Fix sanitizer in handleTransitionLocked." am: 66d9ea6345
am: 201a44a961

Change-Id: I42d2b3c03424b971755d03b6b2e6aa2fc32f3b31