Merge 7bb1ebc2928d869ab3fce3af6b92830a412dc793 on remote branch

Change-Id: I5e8f98d69911631fa5de4333c99c207c55ab7a66