Remove newly added but deprecated master switch location setting methods.

Change-Id: I5e85a1efafe45cee89e08b97a0dcb016c91fd572
1 file changed