jira: 8339 Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4 (cherry picked from commit f4379b3e193ac6d30b8ee91b5c3ff5518aec1f31)
jira: 8339 Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4 (cherry picked from commit f4379b3e193ac6d30b8ee91b5c3ff5518aec1f31)