Merge "Use non-wakeup alarm for delay constraint."
am: 3f9e9efe46

Change-Id: I4cabe0a555904c592b592313cdf5d5ec596d165b