CAF to N1 changes

Change-Id: I4190fa7aac6940492608388c25ae1da30ec6ae1d