Merge 68402beca59f5478aa86eeccf8ebe1edce7ff46f on remote branch

Change-Id: I27d833e816dfbf7a0ecb6081d48649afd8f1357b