Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400 (cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)