Commited files that got lost in patch set 2 of Gerrit commit 42218

https://gerrit.wikimedia.org/r/#/c/42218/

Change-Id: Ic810217b2fa3ae835f346d2429eda77ae50f2fca