Merge 78d5142821c7e9e9cc794aed4d945bf1fcb5a23c on remote branch

Change-Id: I92f0e4e2b63283e33c8c431027321c56fca63a1b