Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:17:55 +0000 (17:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:17:55 +0000 (17:17 +0000)

Trivial merge