Changes for CA

See http://review.carbon-rom.com/#/c/1871 for changes

Change-Id: I2aa3716c9ed1acbda8fcc3fe432c12c05b0999be
Fix Interface header fc

Change-Id: I674505c24c8291810949892564cf1bb5f7a000d0