Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9d2e819639  -s ours
am: 1d86fe538e  -s ours

Change-Id: Ic2318b6a8d10f6d8f498face4883bf654426f689