[automerger skipped] Import translations. DO NOT MERGE
am: 742282346a  -s ours

Change-Id: Ic217b48d7893869967fb5f6deb3aa13602b72aff