Merge b6cf9bc74ae2eb973f17be610b080e86e4d82371 on remote branch

Change-Id: Ib97d8291a6bc55e9ea65f6a4e3594d8caf22c946