Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3
am: 72cb924f07

Change-Id: Ia16c6125567ceac4edfff095e737751c46fde7bf