Merge a1af7c3864b89c05944e604bc110a383b182e426 on remote branch

Change-Id: Ic6ff71d62c02cf1a2dd0597621f831245422b602