Change-Id: I46e8d9fd32c7745c313030da62da41486a77b3ea (cherry picked from commit 46d6e0016610ced51a76189daeb3ad0e3dbbf94c)