Merge commit '75c6421176188027b8ab877163921749b0c2b9cd' of sso://googleplex-android/platform/platform_testing into HEAD
Change-Id: I1be65b079497131d3bb5fa3cf59492a97f15b67b