Merge "Annotate binder services and tokens."
am: 52236db1c9

Change-Id: Ia3e9c9e246cf4842599bb5b3fa71d50f8a63843a