[automerger skipped] Import translations. DO NOT MERGE am: 751ffa4da9 -s ours
am: 1f12d5a14b -s ours
am skip reason: subject contains skip directive

Change-Id: I1c43280df0ed96ec474a330af6b91f74c093ae16