Merge c4ddefcfd1268445e003213159ade66485d36ca4 on remote branch

Change-Id: I6974ba238972f550d6eb8dbfbce59b3009e504a2