am e4924958: am 638a2a4a: Merge "Fix crash in CoordinatorLayout DO NOT MERGE" into mnc-dev

* commit 'e4924958c037b6c8fe7fc0a4aac405811fe50410':
  Fix crash in CoordinatorLayout DO NOT MERGE