Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
am: 5025812860

Change-Id: Id84d7761db866905a8c6850beca302f17674ba5f