Merge "Make internal methods package-private." into lmp-mr1-ub-dev