[automerger skipped] Import translations. DO NOT MERGE am: a4ed762deb  -s ours
am: 4c1c489ea1  -s ours

Change-Id: I3d7e5c070036b40c06755023424e8ae108edea09