Change-Id: I4d153b76df8752ca97f394ebb4dd96c4550e95af (cherry picked from commit 217e7b332c89160d322a86c25ae35b106dcb7d60)