Change-Id: Ic430728bef302fec47a4304679cc5955a435d5e3 (cherry picked from commit 2a28dd67098e298957a83bb4d446623844db6bd8)