Change-Id: I3066019e7dc341e48c681f6e3089df334b9739a1 (cherry picked from commit 1698800c66b7c97f19ce8777dc79e7047f77e38f)