Change-Id: I381980d89d4d08ab0081a4fa0d02986bdf0fb1d3 (cherry picked from commit 6614e27a1139afc748d44f967b560bd845ee04b4)