Change-Id: I10e844b81f7651ff55e4d3fc59ba56f96668a9dc (cherry picked from commit 5ad83d9aa423410dacccab480068874383e17210)