Update to match current WMF usage

Change-Id: I5e36f92b792e226ae4d78f05debd56356d70e091
Merge "Update to match current WMF usage"