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

Change-Id: I5a3cae5a687695b3b3c20baf64b147d108cf130b