Merge 52b2c64d11bb8aebabdd5812e4958d8f9845eed3 on remote branch

Change-Id: Iaabd3a8b4d3eadf188f36885d93c62f074b96860