Merge 4e2e48021d5e9d8b123dcd1177ed4a48090fe8fa on remote branch

Change-Id: Ic0cb2c93815d8cab363d46ef9ae180d157a5b76c