Merge 00d767e19ac6f37eeeae92ab14cdc9b6922ace20 on remote branch

Change-Id: Ie6c45a2ee67d8618274cfd5534fe613868fa7868