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

Change-Id: Ie6fd941dcae5a742701864bee75da27ad0dcda12