[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: 1f8f4362c4 -s ours
am: 7aaf659356 -s ours
am skip reason: subject contains skip directive

Change-Id: I787acbcfe6a89991220b6a0560f8cf7aa8320f88