Merge "Fix Fade constructor" into nyc-support-24.1-dev
am: 16e9aa9f2d

Change-Id: I62dbfd4957d0eaabe0a6c631371aa0cce22b4991