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

Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef