DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f  -s ours
am: 145907b2f5  -s ours

Change-Id: Iffa33cd078e302c60ed8d9d5e2ab082058122761