CYNGNOS-264 Change-Id: I736deda8d6c87196050022ac0e7b6bf8b56dbba2 (cherry picked from commit c7a58bcc60)
c7a58bcc60