Merge 8ecfa7d0a696444d67a69bc0426fcc9f4e401ae4 on remote branch

Change-Id: If3724196e54ba52709ea2d77746e5053a85e0c1d