[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
am: 71f5cfa650  -s ours

Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f