[automerger skipped] Import translations. DO NOT MERGE
am: 4ab2773a32  -s ours

Change-Id: Id0467d2c00fe7e58eff9c751667d4b6f5ca97704