Heads up master switch (2/2)

Change-Id: I2f00ad71e564bc15c3904d295cfdccc4a4673996