Updating to latest wmf

Change-Id: I0f0bbb02e8d16b3915bdc21f1ad196d4d6a834d0
Merge "Updating to latest wmf" into wmf/1.24wmf16