Merge "Add reporting of long wake locks." into nyc-mr1-dev