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

Change-Id: If75dbacbe50eaea5684caa0c71d7b6d08a861621