Initial empty repository
Merge commit '005473941b97ab735a3de72754ffbbca75dea70e' into HEAD
Change MediaRouter discovery flag

Change-Id: Iebc696c268670d7d7cba18fe805625cb9a04f405