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

Change-Id: Ie9ff552b79f35ad5227362a8b1b390055cdfa21a