[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21  -s ours
am: cd4371f3cc  -s ours

Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488