Merge commit '2898223375d57fb3974f24e1e944bb624f67cb73' into goog/master

Bug: b/122887108
Change-Id: I01716fa7e896506aff0e44e5bb57559aa6706efa