First pass at observe support.

Change-Id: Ib847413dffe05feab44709a30178d081ab40a8e5