Change-Id: If9c2fe58d4cf758bb6b6cf363dc01f35f8720987 (cherry picked from commit 0de10680b7e5a9dfc85173bcfd338fd3656aa57f)