Merge "Partial revert of change 10737163eb75062f7ec42c45d526f4d5cad60678"