[automerger skipped] Import translations. DO NOT MERGE am: f1a410e6d5  -s ours
am: 72b61d0f2b  -s ours

Change-Id: I22ca05a563f3ac4357aef01b0d48f8b3e6d2f8dd