Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7011419f06  -s ours am: 6c3370a924  -s ours
am: 227c56f50a  -s ours

Change-Id: Iabb20772fe410e9ca75c26059120e73df7a9e185