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

* commit '5e21999cf0ed0a2d2311635c9e2b85a6734cdab1':