am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit '351453a18755e24abf1906e6fec469e8691baba1':
  Revert "Revert "Enable Launcher2 workspace import.""