Change-Id: Ib35a31e46fe1c6b84d2e17d50c04a146e82f0270 (cherry picked from commit c79ee70d34f8628a50f6aaa73d256f5444094b62)