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

Change-Id: I478160ef460ebfe3f4379b1830c25a376672eeef