Merge \\"Support promotion of WFC.\\" into nyc-mr1-dev am: 89f24dbee3
am: 7163586336

Change-Id: I9391c678e6bfb37e3bedff293129ea99b1431cc2