[automerger skipped] Import translations. DO NOT MERGE skipped: f678839035 skipped: 9d959be951
am: a9f73101a2  -s ours

Change-Id: I506f42a492f890aef01dbd4c1d79dc3e341ae93a