Fully-sync with CAF kk_3.5: phase 2

Signed-off-by: Sultanxda <sultanxda@gmail.com>
Fully-sync with CAF kk_3.5: phase 3
Fully-sync with CAF kk_3.5: phase 4

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