am 488891d8: Merge "Replace AlarmClock with DeskClock in the SDK" into kraken