[automerger skipped] Import translations. DO NOT MERGE am: f1e80dffbc -s ours am: ed54922c14 -s ours
am: 2a676e1a41 -s ours
am skip reason: subject contains skip directive

Change-Id: I09907f4240718008feef983ab741ca07774511f3