Merge "ITokenManager in hal manifest." am: bd3a930386
am: f69517c298

Change-Id: Ib25bc72a65776a34b83719581622bc065e4b7065