Merge c64dc70f7c23e1493f5ce197c107dcfbfb234e7f on remote branch

Change-Id: I08316ed7ce1a8d06e19ef626dfb58062d6feddfa