S3 master rotation done

Change-Id: I36566a3b084abaae65f0c9c6bbf64b396a5e74a2