Sync with latest CAF kk_3.5 changes

Signed-off-by: Sultanxda <sultanxda@gmail.com>