Merge afa7b730dd895418d0c52d7f9bd9b0883ea6df68 on remote branch

Change-Id: I8ab2e5c981e3e6844f491d8dd68ec731c3cfe627