tree b8ddef1fb5ef089b2d7ae3478d5303314369b617
parent f852b1bcfaccca39b403549124c1ea40d0c525d7
author Charles Chan <rascov@gmail.com> 1515104767 -0800
committer Charles Chan <rascov@gmail.com> 1515534927 -0800

CORD-2470 Fix NPEs

Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8