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

Change-Id: I701957dceecec49950ffab22ab6ca38f204d687e