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

Change-Id: I3f5e75c8350a5a9542d270fa88d8176d808e05f2