Merge deef509585b4f30218055326b6adf68f71cab6e2 on remote branch

Change-Id: I0af49bc4063be4fc9aaaaf9554ed33c864ef863f