Merge commit '657fb934c870fbaa874804212b2fff1ea1684a1f'

Bug: 60158
Change-Id: Ibd18adf0ee32e7aa3a42aeedaa741217fe5e938a