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

Change-Id: I33b16271f3178f7b3c59bd2193a1c4a9682c0634