[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8069da859c -s ours am skip reason: subject contains skip directive Change-Id: Ibb271460e1e291a8d57eae9bcba04874c5fc1b3c