CYNGNOS-264 Change-Id: I6ac0b00fea1c482c3f87ae10600a1c913afcc8af (cherry picked from commit a1c8217e77)
a1c8217e77