tree 843671954d2889ae297238e51ae1775a1dd1dc6c
parent ef92f19c6cdda44dd1fd012893b1907c83879c78
author Charles Chan <rascov@gmail.com> 1515104767 -0800
committer Charles Chan <rascov@gmail.com> 1515534927 -0800

CORD-2470 Fix NPEs

Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8