Merge "Null check intent before starting "learn more"." into nyc-dev
am: 4e4e4ff19a

Change-Id: I4d25b74d3cb8781b5f80f714d749dd59f3ec0c83