[automerger skipped] Import translations. DO NOT MERGE
am: 9e39db9d62  -s ours

Change-Id: I7fee4d617fe40d725dbd8bee03e138b95fb3cb9c