[automerger skipped] Import translations. DO NOT MERGE am: 17af9260f8 -s ours am: 682ad3a62c -s ours am: 5988c751d2 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic60d98bd0b5218df8c0dfc23d90c9d42d168897e