Updating patches to sync with upstream

Change-Id: Ib34875196b9abfaf8208816bd3f68c6a1129443a
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>