Merge 3f59f888a1db19270b85e464e46ad9ac8b53e82a on remote branch

Change-Id: I4071e5b35b1caf512dbb5e91f8d6bff5e5af53e1