Merge "Self-managed CS implementation continued."
am: 13378b9966

Change-Id: I58c886a134ddb30548c2289d720324e88099ec37