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

Change-Id: I8d8e132f58db84bd2e1ed80077735f23956d8337