Change-Id: I31bc776b2cd7f6543705c44609fbcf22d9259be5 (cherry picked from commit b4f63447c9f8662b74b2a0a3579e0a84fdba92ad)