[automerger skipped] Import translations. DO NOT MERGE am: 706531326d -s ours am: 6fdc502052 -s ours am: bc51c8f1e2 -s ours
am skip reason: subject contains skip directive

Change-Id: If5ade4668fa5e3b6c9cd29d7087827b18cdf8c6e