Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2 am: 6a643c3a60
am: efeae9bca4  -s ours

Change-Id: I0f30285eb2f851fd0c5ab1a3e94a40a426251ba1