Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
am: 7219f8bac8

Change-Id: I04263e131472d5b0f0f3ffd408988d4b44a6b195