am c44de1ad: Merge "Revert resource name to what platform ui automator test...
am c44de1ad: Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby
* commit 'c44de1ad':
Revert resource name to what platform ui automator test defines. b/21923650