Merge 1672dc3230b5bd5352c8e8f96652c9c5956bc3d3 on remote branch

Change-Id: I8bdc3c384a61feaba14b01c0f6e1288372e60fae