Change-Id: I154e873df1df3503a09c41d6b3874ca195af91d9 (cherry picked from commit 861095f761b40171e0dc25f769f486d910cc3e88)