Merge "Fix BottomNavigationViewTest." into nyc-mr1-dev