Merge "Fixing NPE + Compilation issue with Showcase sample app." into nyc-dev am: 32e05f3
am: c40f0d9

* commit 'c40f0d92085c4f0041368b08a04c5bef27371988':
  Fixing NPE + Compilation issue with Showcase sample app.

Change-Id: Ied410ca8e13c46bb0cbc2a2afa29215f5fc0a9d6