[automerger skipped] Import translations. DO NOT MERGE
am: 3b87db2514 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bb897823fd01db08d8634e9bc629512f743c9b1