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

Change-Id: I5fc3359fe6b48f03f0569ca3c0c2b72a5553f48f