[automerger skipped] Import translations. DO NOT MERGE am: 3447b7b66c -s ours am: b9b2241edb -s ours
am: 4abe52e1ef -s ours
am skip reason: subject contains skip directive

Change-Id: I3ba6f3113410ecf458c1f2c78d932795832ed760