Changed ResourceNotEncoded to ResourceJavascript in some areas where it is needed

Change-Id: Ia2663edb4771cd3ebc73e2de0685ee1abe8c7173