Merge 6e17e6235ae5216b7f174bfedecf5ebda6b555ba on remote branch

Change-Id: Ic5dbf7ccf4278b3d03d2411eff70ed47f796f660