am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev * commit '9348d760': Revert "make FLP play nicely with multiuser"