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

Change-Id: If4f66d61ed0d83d46c931906adeef5248b831347