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

* commit '1ee39bf7f7037c8ed7f15ce8eb6f1ba38e9b1c9c':

Change-Id: I25134c618e728ae6e25003f7ec8a3352d6be7f52