Merge branch 'gerrit/stabilization-5e11053887'

Change-Id: I63dbfc59393105b7b1c58dcae2efee8ca88314b0