Merge "Add session id to grant button clicked proto"