Merge \"Add reporting of long wake locks.\" into nyc-mr1-dev
am: ca37695ebc

Change-Id: I98b06d561945fddef5be4b749b5b2128b8622add