Merge 227324c137c9168a977b0d3dc81e031ac1af56ba on remote branch

Change-Id: If6a10ee80a81d4d9847ff3a31ba619b4117869cd