am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with...
am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
* commit '5182ea4b':
Add media router service and integrate with remote displays.