Merge 678c00edb8a1c22f5fbc3ec532dfd2bec990bf9a on remote branch

Change-Id: I0247e817d3831c1ec560fa81269c92b95cce426e