[automerger skipped] Import translations. DO NOT MERGE am: 08ea0d1fc3  -s ours
am: 9b677376dd  -s ours

Change-Id: Ic50b0206e9485dd1652d43e03729f512c81a07f2