Rebase on CAF

Change-Id: I2cba32709422e6917e760973f913c4cb6691bc49