Merge "Switched from using jackson to using gson. Refactored exception...
Merge "Switched from using jackson to using gson. Refactored exception handling per advice given in tv channels/programs codelab." into nyc-mr1-dev am: c1411194
am: 9cb0b335
Change-Id: I573a2c3b93ceb9d8569141a987be1ddbae02a61f