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

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

Change-Id: I81f8ac41dee15848898d46bba0c240176c651584