[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0a9cf80e44 -s ours am: 7d2e901b9d -s ours
am skip reason: subject contains skip directive

Change-Id: I4814aea59de0eb251811ff47b1302c981187f306