Merge 6498982b978cf49fcc4d74c9ddcb224e368908ce on remote branch

Change-Id: Ibc64c8f916edc240896540b47f5ba5f868ac105d