Initial empty repository
Merge commit '64d0746afc6c532c43604e0c1cc537c554eb1960' into HEAD
Change MediaRouter discovery flag

Change-Id: Ife5536eea25c7ea060ceb5f535896ba8afc0e39c