Override elements must be after dependency elements #13532

Change-Id: I8cc1fd86a8ba7ba64595809afbd964e3b384d658