Merge ff2d8899c6de182d20b69611129ca0bd460f0e53 on remote branch

Change-Id: Ic19033a04faca66867a61a9d0f3681d3ec68fe89