Merge 6e72525e9c4cf386e761a671229f0a37c137397f on remote branch

Change-Id: I0e5fb4ad240b1735527f54e22aef910b6586e134