Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c6104 -s ours am: 1de3fd81 -s ours am: de19b85c -s ours Change-Id: I2db346eda1e5abd2ddfffc6b19fc5c5eae1d3f57