Merge 2ffdc53a27da278bbec25c5e4cb4270a98481050 on remote branch

Change-Id: I5a591d2b53f984323c5dddfbe72bf4eb029fec4e