Merge 309a76a3d6bcd8cd09287c753be04d20b946f05e on remote branch

Change-Id: I20532258bda4571b78ef71b04878d0d61914a4cc