Change-Id: I7ae0e44eb5179b04a6ac861ec1c65f3b18c38f0f (cherry picked from commit 143d74775b2b62884090fdd88874134b9eab2888)