Merge 3018674d2d940315771a6eb985a29340a797f6e3 on remote branch

Change-Id: I98db4897c0135af8243954ef306f5022bfcd03af