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

Change-Id: I30e310a0e002907d0c0feff041d803dfe7705a54