Merge \"Added more logs to track WakeLock usages\" into nyc-dev
am: 335387a1df

Change-Id: I1383a36b05e50d7a20e477f70c5c8f64ce36041c