Change-Id: Ie23377db59196edc1857071b91889e2165e63127 (cherry picked from commit 84dc9d988decae3164c084a6b579522276cb4010)