Merge ade33ca4720ea7c553d081031b6c8c6ce08095e3 on remote branch

Change-Id: I33b497feb1556a3d301c2afa2c26bd95a6e59539