Merge "Self Managed CS Implementation"
am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd