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

Change-Id: Ia2a0fec158a49c723cc3923baafa024aa3570c0b