Merge ea311cdd436a78ecedf6f9d4dbafbad3bcb2f34f on remote branch

Change-Id: I6d5bd8bbe1bed0775dbeb947707e24fc272ba4ca