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

Change-Id: Ia6d217c8669232b14eccf867b1e5826bb4a286d5