Merge edcbf7f79d6e334518b7a6f9bd391c2b420b995c on remote branch

Change-Id: Icd418cdf326757b5acedf9694ce7c3caff1dd1ca