Merge 3eb5fa26ea2ac9e0b66b16cd0b8d3ad8a3e5e365 on remote branch

Change-Id: I52d9eaa68bd19776edc59ff1d64577a7c0834ec5