am 323caa34: (-s ours) am 8c604349: Merge "Fix for a Launcher crash."

* commit '323caa34b921782a5765b49b72a2483f76ee85de':
  Fix for a Launcher crash.