[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
am: 9204ce40e4  -s ours

Change-Id: Ic798dfd5e7b85f7341d2c929519aa227a95e6f18