Change-Id: I9b19f69788068be05b3295247cdd7b972f8a573c (cherry picked from commit c583ab02c730be0a63d974039a78f2dc67dc2db6)