Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev
am: 73522651e2

* commit '73522651e2dd4085bd7f5c568dd9775f3643fb9a':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: I94ca1670ca5016f0a4f8dd860ac290b528425c2c