Merge 48baf881bbb089e235d5d17aec1cb90cb4932996 on remote branch

Change-Id: If3a9ef132275712a6bb8d1357a94038e2eb61dc1