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