That way it can better handle tokens and service binding. Change-Id: I9b882181ecbe52a65e731a2c45f1d296315884b4