Merge "Removing hardcoded database column name" into nyc-dev
am: aae1559613

* commit 'aae1559613cc24ad1d960b550c15af9f61675f38':
  Removing hardcoded database column name