Merge "Wake-and-unlock fixes" into qt-r1-dev
am: 5d35ad3393

Change-Id: Ifbee059d6de97ccb4994e4e7a24ae41d8167fa9e