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

Change-Id: Ifa59093fa8f678aca4f794249d464da4a0acfac5