[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199
am: a9d64326ad  -s ours

Change-Id: I786402375e6a75936d097c82a0221a3c8db94268