Merge commit 'goog/readonly-korg-master' into merge_korg_master

* commit 'goog/readonly-korg-master':
  Fix for a hang when attempting to stream a non-existing content.

Conflicts:
	res/values/strings.xml