Merge 1a4258a37c16395648c96b3436afbf64252066e0 on remote branch

Change-Id: I77ef0f3d1bc2f770e93acb127942c93e1686fd43