[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 55144fc555 -s ours am: 67fafbbeb9 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fa37d0ab9e8cba1962e1f28b7cd969a07c8b54c