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

Change-Id: Id7aa06f564d69f30e49828c10e3fd399b331c38b