am d6451e02: Merge "Move NMS observers to RemoteCallbackList."

* commit 'd6451e02ad2da274c64b973561bbece6a86631ef':
  Move NMS observers to RemoteCallbackList.