Merge "Modify AIDLs to include Session.Info"