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

Change-Id: I9c7d689c692f1e66de5be4c226707b3c509fba00