[automerger skipped] Import translations. DO NOT MERGE am: 9082edabbe -s ours am: 47ff1e1400 -s ours
am skip reason: subject contains skip directive

Change-Id: I39965a8bcb410e80be3ebdd39b91ef4c891b9944