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

Change-Id: I350769ec84aec14c390558fd17275a338ff32dd4