preparing to switch s1/s5 masters

Change-Id: I3b6fd744ec1441cdebed9d412c8e88b1ec448814
Merge "preparing to switch s1/s5 masters" into production