[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 90706c5994 -s ours am: 7c6d458a50 -s ours
am skip reason: subject contains skip directive

Change-Id: Iedf584ab433b9c3381d8c21b495f2329c95b45f5