Sync with CAF

Change-Id: I8bf9a283d183aba4e4ae4af285fbed393dac104e