Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2
am: 6a643c3a60

Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0