(cherry picked from commit ec81142a98488552276a425d6363533368d02025) Conflicts: include/linux/wakelock.h Change-Id: I185d58274d2b1d69447981b669f5921c74f73a00
(cherry picked from commit ec81142a98488552276a425d6363533368d02025) Conflicts: include/linux/wakelock.h Change-Id: I185d58274d2b1d69447981b669f5921c74f73a00