Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5  -s ours
am: 1018a5d4a1  -s ours

Change-Id: Iee62f36c79ce3056bf3b100251bd78e760655718