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

Change-Id: I0bb174d824972357caffaf1548db58c96b862130