Merge 48f8641d19988395e9be5fcb793c075e90e043e4 on remote branch

Change-Id: Ic71f56b2a6534978db6158b5ae023dfb78cff480