Backported to precise-wikimedia.

Change-Id: Ie2243bd70cd03207efc7d4d759c3d1c58d4c5f4e
Merge "Backported to precise-wikimedia."