Ticket: CYNGNOS-2431 Change-Id: I75249f0bbb6e59f47e4a30608bb63b42c93c6e37 (cherry picked from commit 2e75c4ee04)
2e75c4ee04