Change-Id: I8543992099e0a5a858509f547ce9dffa42a1f608 (cherry picked from commit 53bb70e3f68a92829c2d9a60eb8063a2d5511373)