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

Change-Id: Ib83acead71ef1c92842ace03a94556be723f55ba