Merge dadd76fd3322be435481c379c6787a0d3b041ace on remote branch

Change-Id: I193807130099c07591fa08de3fabc3d43eb8ada2