Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0 Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a Former-commit-id: 75ec73e02885fe0f646bc8961f3ea876597abab9
CcfpRecord to that project. Updated feature and manifest references. Amend: Updates from peer review. Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3 Former-commit-id: b80a3b8d1c90b7fb8720171f16529edc81bc30a8