Version 1.9, see the changelist for a list of changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/VideoCastManager.java