Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 497bbfd9ac  -s ours

Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe