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: Ieaa81a4f0065ea53e8d248d8ce05c0c9c41a6419