Merge c40897e56ed243285a82c5e0f0058f7ef6f49b60 on remote branch

Change-Id: I0d63427754f6745f116e993da54c44d59700d200