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
am: 322df8f255

* commit '322df8f255d747f66e667998a10cdaa069d318de':