am 0995df61: am 7beb7d75: Merge "CoordinatorLayout bugfixes" into lmp-mr1-ub-dev

* commit '0995df61c5a8b47c8a197c3714a3dd9213ffeeee':
  CoordinatorLayout bugfixes