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
am: e6f99109
Change-Id: I15bb18c3171ee44b06bc8435d68faa9d695c34bf