Merge 093c4faaf7937f5091676f6ea2a4ae6094332e38 on remote branch

Change-Id: I469424c12f84eb668bfed950ac48d2da43f191d6