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

* commit '4f2b30f423484e3a5e6abc293f5899cffd82f34b':
  CoordinatorLayout bugfixes