Merge 7dd747554250ea6875fac0c741f9a3fc570792cf on remote branch

Change-Id: Ia05835fafe44f5db1705a928cd21c826bd671214