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

* commit '43b8bcc0ed9628ec8923f939f647e46709cc88f4':

Change-Id: I78e99c056d06b4907234d2e04d5261299b27727d