Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev