[automerger skipped] Import translations. DO NOT MERGE am: b77922f304  -s ours
am: 2be901f9c3  -s ours

Change-Id: Iad198cfa941345c350781cee43aa31f49c22d3fb