Merge 6da25f4fd2cefebd5c2bc25c08bd31a8ad32a68f on remote branch

Change-Id: I420b5f60527000fd6384d8e749f53932a6581a0e