Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d  -s ours
am: 37f90d5767  -s ours

Change-Id: I575b7b2d41f1660de1628faf192e9031fd409a8a