[automerger skipped] Import translations. DO NOT MERGE skipped: 779fdb98b4 skipped: a4ed730dbe
am: 0c5f0375f0  -s ours

Change-Id: I824f89319f22ad2645f4a1311eb1acec92cb99df