Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into...
Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev am: 73522651 am: cb1b73c8
am: 35e41618
* commit '35e41618':
Fix regression from "PIP: Fix NPE when onboarding is shown"
Change-Id: Ie4bd1d958f7d0207e9a70aaaae61c9c812cceedd