Merge "Import translations. DO NOT MERGE" into oc-dev am: 631b0fb9bc  -s ours
am: a720d15477  -s ours

Change-Id: I597452e5fb47b0df31aa5b19aff8e0132dd4ad8a