Merge 4fb6e2e9c8e333d16620a25bb4d0c096aba327fd on remote branch

Change-Id: I7af35644d2cffa1de66d2090bb25b22d1be09cec