Relevant change in master is ag/1844170 bug: 34147053 Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b (cherry picked from commit e3286c31)