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

Change-Id: I59e9a260eb0e2d0fac9fb438e4dbf0784cfa7ff5