(Null) merge branch 'gerrit/stabilization-5e11053887'

Change-Id: Ib6f57109b6c45ff9ee1eda630df3e462570121fe