Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d  -s ours am: 7eed96cc1c  -s ours
am: 3d57a96042  -s ours

Change-Id: I7bef4cc203c6d162f9333a5f4c2948cecc167e69