Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev
am: 1ceefe041f

* commit '1ceefe041f95d124a5dd8d1ce165ff3a45e15128':