Merge 2b7b529d48b8ae2629a4644063332adb3ebc2256 on remote branch

Change-Id: I27c5b546a48bb4f0901db27ddf51feeff15ea194