Test: presubmits Bug: 227806937 Change-Id: I3718dc5152e56f9b49359cf0d701d46312f89cdf (cherry picked from commit eff01724)