Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
am: 56746f9830

Change-Id: I89b58af12ee5940ad3f4cbb93f9777eeb641df86