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

Change-Id: I4e75f6c7f3cf5deb7e98dddb668be350d1c60dd9