[automerger skipped] Import translations. DO NOT MERGE am: 8c56825ecd  -s ours
am: 5236bf8780  -s ours

Change-Id: Ibdb9322f8935be31ef56c583bc90ab4ac5a49c39