Merge branch 'gerrit/stabilization-5949a1cb71'

Change-Id: Ib72cfa1a734dc260e283ea81da71e25c8e370097