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

Change-Id: Ic51cb94353045dc06b330a69dc21d9ee76470ae5