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

Change-Id: Ie6c77c799b1c64064897d03da2e1600d3e113b69