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

Change-Id: Ifd1ae1d2a54f95e2ad308e88c24d51db0305e7e7