Merge "Bug 3366668 Use BinderService template"