More work on active/status indication.

Change-Id: Ie869e9cab7c4a5b64a92d0bbecda98ee7ca2adfa