Caf to N1 changes

Change-Id: I92bb65d2b9fa477e109d4e4238c2984e8b11a02e