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

Change-Id: Id0fb08895ba23196a6f27079f86791ea70b41565