Merge "DO NOT MERGE Fix French locale % escaping" into pi-dev am: eb950bbe46  -s ours
am: fc469a5cd9  -s ours

Change-Id: If53498b2273100e5e8f04cf93f2f4a66d8272d6c