[automerger skipped] Import translations. DO NOT MERGE
am: 61f1c5a1ba -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfc8a581b1c1e12c9335eb485a888fea6f127c18