Merge "Add master switch to enable/disable RESTRICTED bucket." into rvc-dev am: 86a71e6e93

Change-Id: I627a314d8c43338965ce4601420f108a5f4e324d