[automerger skipped] Merge "Import translations. DO NOT MERGE" am: c5032e2519 -s ours
am: 0ab7319c8d -s ours
am skip reason: subject contains skip directive

Change-Id: I8df8e2a2b333f66c510704395679c6170f17f2ef