Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev