Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: da3b9b9752  -s ours
am: 71dabe0eed  -s ours

Change-Id: I30964a88d1d143b0558f9dde6a05a8ad1cb14c30