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

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

Change-Id: I4b81c5694f90634c5cd8dfa9f6d7f78c81536189