Merge "[fuchsia] Remove unnecessary patch." am: f69cd87e9f am: 4c30f0d5bb
am: e576b05709

Change-Id: Ib351ec718b18855946ba4874e77d08b8736f741c