[automerger skipped] Import translations. DO NOT MERGE am: 13f6522bc0  -s ours
am: 817fc860ad  -s ours

Change-Id: I29e45139dbc7030ccbde9306a7307e792825fcba