Merge "Improving WTF logging in AlarmManager"