[automerger skipped] Import translations. DO NOT MERGE
am: 86df8fb903 -s ours
am skip reason: subject contains skip directive

Change-Id: I75ad49d522172d6591663a4c38e69d622f7ffb31