Merge "Fix CoordinatorLayout IllegalArgumentException crash" into nyc-mr1-dev am: 76f4c18e25 am: 349884d542
am: 01b786320f

Change-Id: Ia8930946a05cbd3dbc373ec1c0e80e5263368231