[1.22wmf5] ULS to master

Change-Id: Id79b45e90250242ac74292238a179080359b0898