Change-Id: I367f9afd1052419acfd692d305630672b5e2dd68 (cherry picked from commit 7767c6dd0bf873e8c88d71dd050a8dc751d7c954)