[automerger skipped] Merge "Override old alarms in zen schedule" into pi-dev am: 2ab75b2b2e
am: 0a9b851293 -s ours
am skip reason: change_id I371a586d470e3e341a42fb5ae3b8f32929214c18 with SHA1 4e76191a9f is in history

Change-Id: I00ecfc315a3edd07b8f497410f2748e748823a73