[automerger skipped] Import translations. DO NOT MERGE am: 1308522cd5 -s ours am: 5dfae2112f -s ours
am: 1fbadbba17 -s ours
am skip reason: subject contains skip directive

Change-Id: I01ade10783d9841b8f207ce08b0129794388ef9a