Update Thanks for I340665f211

Change-Id: I053a188868e98d59a5336d2729201561dc35a3a0
Merge "Update Thanks for I340665f211" into wmf/1.24wmf20