[automerger skipped] Import translations. DO NOT MERGE am: 145808acad -s ours
am: 7eff036f7d -s ours
am skip reason: subject contains skip directive

Change-Id: I3274d09fd69e725b4509a6999fb3202e6d4c4c47