[automerger skipped] Import translations. DO NOT MERGE skipped: e41dc49044 skipped: ff13453f87 am: 909bf33219  -s ours am: f5a3c2d7fb  -s ours
am: 74ccd3a3c5  -s ours

Change-Id: I028697db6e2b88450b6571851f919e33f80ee9c0