Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 98fb65c213 am: 721971a749
am: 26e27bcbab

* commit '26e27bcbab8271f6f8f98a8b22fcd1b3b4e3b513':