sync with prod.

Change-Id: I69ffc1d97c48d56fe408797f18ad70afde3c47bc
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>
Merge "sync with prod."