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

Change-Id: Id2f88bf0aa3ce2da5a1666798d1a71e1e20ff62a