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

* commit '6d91eee3e7d064d7ca695da1fcb755e1ae1d58e9':
  Fix crash in CoordinatorLayout DO NOT MERGE