Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 25a7155006  -s ours
am: 9946ed57a2  -s ours

Change-Id: Id6616005f104400f2c860283f5f5f27af783f772