Change-Id: I637465bcff6454f414c349a0ab054d66e3d17a05 (cherry picked from commit 4e9a7ce2f70a21a71f828335a6041101f2bf833e)