Merge "Don't reset to a level above warmup threshold." am: fbb22de21c
am: a2959cb9e3

Change-Id: Ifd1c79f6347951539c6590ac371ab2872ae76edd