Merge "Minor cleanup to fix a few things in the media sample" into lmp-dev
tree: 8941dd8cb87c410323b1d359c52cc66149b396fc
  1. AutoMessagingDemo/
  2. JustForUs/
  3. MusicDemo/