am cd080cae: am 35f494c9: Merge "Position the FAB visually correct pre-Lollipop" into lmp-mr1-ub-dev

* commit 'cd080caea701b6b13dcbf99fd2ec54d9ed855a1e':
  Position the FAB visually correct pre-Lollipop