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

Change-Id: I022163bf53955393f479c3031b059fc00b31e240