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

Change-Id: Ib3d8f1f8e5398fcce0373d0cda38410dc217fe79