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

Change-Id: I014ccf22c3f65e6ed8bb04b6c9ac9b9681d376af