Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev