[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8501ef04ea -s ours am: 88efe3ea38 -s ours am: 4fcfb824ad -s ours
am skip reason: subject contains skip directive

Change-Id: I9f89bd812215e0b92d4975a03802392b8f084b52