Merge 68b7901e27ffba615280ffd002f0891c8ca4c354 on remote branch

Change-Id: Id9ab8b0879a368e7a5e20be50e565a8a2901e8de