jira:[udesk 7578206] Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b (cherry picked from commit 8dfa6839e5e3a9bebb03616ff6d0c0c1699ad22f)
jira:[udesk 7578206] Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b (cherry picked from commit 8dfa6839e5e3a9bebb03616ff6d0c0c1699ad22f)