[automerger skipped] Import translations. DO NOT MERGE am: 1308522cd5 -s ours am: 5dfae2112f -s ours
am: b970a44ed1 -s ours
am skip reason: subject contains skip directive

Change-Id: I8efd9aa15b96d06a3abddca6b55d9897b00361a8