Wiki/consumer language cleanup

Change-Id: If257d4d52f4f6de84ddf683d8ab19ab802e850db
Merge "Wiki/consumer language cleanup"