Merge "Avoid stuck wake-locks" into qt-dev
am: 13775aa4bb

Change-Id: Id51fe28e2b53d4d580ddcb437e18914471613504