Change-Id: I05cca90f1197ec04f45c630348ada17746238444 (cherry picked from commit 453b76e7af2f19d261071c2cf1c1bcefef420043)