Change-Id: I36a54fa4508f854cf2e7215896532ec7cc03c802 (cherry picked from commit 33191488f9b584134187660628dfbebe92d50235)