Change-Id: I4f0a0571965a6cd57108c35ad6cc06c8f06f6316 (cherry picked from commit 7999377b90eb8dd243102f2fb9e94cd1017e9bb3)