CAF to N1 changes

Change-Id: Ia4375ab5dc3012547c2b683189b469bb135a91bd