Merge "Self managed CS implementation."
am: d736a6b2c2

Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147