Merge pull request #14784 from nullaus/bug949286-net-error

bug 949286(cherry picked from commit 6bf24fc3ce7947b70acd2c6f915804f760543fc8)

Fixed Conflicts:
	apps/system/js/net_error.js