Merge "Added more logs to track WakeLock usages" into nyc-dev