Merge 53df0a5530f0721486483056477e902f83feddcd on remote branch

Change-Id: Ib81c7ee631900a46b373faf99c462d693a412ce8