Merge "Import translations. DO NOT MERGE" into oc-dev am: 2f522fc904  -s ours
am: ca2721f9bd  -s ours

Change-Id: I827bb1a6d767d29c53af7cbe069f4f6206fd24bd