Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
am: 838e365581

Change-Id: I7140eb9253c84dc35a5f3bf62576e71e4828c6c5