Revert 3 commits due of other integration from CAF

Change-Id: Id819d434cab35a4eaa993db2af16e900330cb51d