Merge 975959a79b6c493472e8c1e7d547a1b40b3c2312 on remote branch

Change-Id: I72267a40e2c29011fc54d81c0994943940544935