Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev