[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
am: 204f727404  -s ours

Change-Id: I3830beca2052ed387304bcdb546aa431627dae1f