Merge "Turn off Alarm Manager logspew pending a more friendly implementation"