Merge 48b982b4b35c9bd3dbe68da1e75bad53f17e7b15 on remote branch

Change-Id: If118b59fae2d9a40da8536b9566823d9aa3a015c