Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53...