Merge 5723b3adcfb995301753d8d14dae2c8469bcce34 on remote branch

Change-Id: I0e674cb36d3c13988a9a98b954df79a18a843aca