JIRA: no jira Change-Id: Icc370b57591345b372314587f71d04323d71c746 (cherry picked from commit e2e2e4d044cf1d88392c35e1b8ce4367bbe4919b)