jira: [none] Change-Id: If4329081535a1155588afad932403ea3615163f7 (cherry picked from commit 32597b43f94813f3ad6ef99106e234fa9a180971)