Merge 8570363dec0fcef7f6444bf21b746235aea0861f on remote branch

Change-Id: I48848d5a19037a82ef5b392fbedba28a3f69f480