Merge ca6e6593ac35f9b6e6832eb964ca017fbba6e299 on remote branch

Change-Id: If173813dc65506bcb855313d7b5f13898274b92a