Change-Id: I1607fa90e76da495ede48f01ad250baae60108af (cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)