Change-Id: Ieca0aeb236582015e5e4e53629ef66567f420e7a (cherry picked from commit 7d5c45ec46dace26c3e5ae35e8d11e7a7d54fcc2)