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

Change-Id: I1232500c5f954ce757c1371ef2d9eeedb2987728