Change-Id: I7b209eaeeb131d5e9c7a6d8417acca91bcb699cc (cherry picked from commit 866c8e92a402a28427097e17285f6c179c98933c)