Merge "BottomNavigationView javadoc fix up." into nyc-mr1-dev