Merge "Import translations. DO NOT MERGE" into mnc-dev am: f505218d9a  -s ours
am: d9817ed155  -s ours

Change-Id: I2c45ead834bed830770ffc0f2b3e796feef3b339