Merge "Override old alarms in zen schedule" into pi-dev
am: 2ab75b2b2e

Change-Id: I8db691e85b738d2d7821de715e124c1e3ce3b913