Merge 8fefe9acb41d99c84d1fc995c8de6a3d48893dcb on remote branch

Change-Id: If572846f1ca43b08080bddf89f702385d53a7b5d