Merge "BottomNavigationView javadoc fix up." into nyc-mr1-dev am: 498c267573 am: bd2b6e0556
am: 5d97a86687

Change-Id: If61bb81854462e84162fd5b9ec487c95bb50f31a