Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am: 07a375186e

Change-Id: Icd7c52967c634dbdbef55166523039f4004e4d9a