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

Change-Id: I3f3ae22c3533d9d96b249800e747c256a43649c2