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

Change-Id: I734c36fbe57c678d21d804da117b2be9565d6528