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

Change-Id: I489f09027050fe62ebcd0ef1091ee48e1bb9a4ec