Merge "Add null checks for *Buffer params"