Merge 53df0a5530f0721486483056477e902f83feddcd on remote branch

Change-Id: I11180b86f659d174f92e24ba1dbe70b8c21187cc