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

Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298