Merge d618874d53e7401ccd4274d3c41662e83237fd49 on remote branch

Change-Id: I0f34211c0916e066a97ccc6e67a0d7f2bf1c5a46