Merge 7f1cee460891b360b7b762dd9fd6562282ce7384 on remote branch

Change-Id: I13fd827e3aa3d6724dc70a713ecba7562da638b4