Merge branch 'gerrit/stabilization-8bc2f61b7c'

Change-Id: I0c78c95191284b9992ffb6b1fc1c74951d905f92