Merge "AOD: Fix WakeLock leak" into pi-dev
am: 888a82fdb3

Change-Id: I7c34e5f84dc66ea6373f80f2cf976cc07bcfec9a