s3 master rotation for upgrade

Change-Id: I79333fa1db087cbec0158fb861939d9ba65b6c67