This Ordinance may be amended by changing the boundaries of any district or by changing any other provision thereof whenever the public necessity and convenience and general welfare require such amendment. No amendment to provisions of this ordinance that regulate matters listed in Government Code section 65850, as from time to time amended, shall be made unless the Planning Commission and City Council find the amendment to be in conformity with the General Plan. The City Council, in its sole discretion, may direct that amendments to provisions of this Ordinance that regulate matters other than those listed in Government Code section 65850, as from time to time amended, be submitted to the Planning Commission for a finding of conformity with the General Plan.