Merge "Fix crash when adding items to BottomNavigationView." into nyc-mr1-dev am: 9ea1de1d83 am: d1e9889260 am: 18ddaa356e
am: f026af9b53

Change-Id: Iae07e055bee818ff52c47944fb90e58fbc6cbee1