Merge 4e5026322d478ef8350c9c2ad9774fb121a48548 on remote branch

Change-Id: I9a8ab70f8a3309567ec578d4f8e57df5d63e1e0f