Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06
am: 6489b522dc

* commit '6489b522dc8e6cd4fe23e627cd903e7bde79d2dc':
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.

Change-Id: I605acb4bef521d6b257acc1da736e38bd606acf6