[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425
am: cb80417eab  -s ours

Change-Id: I29e67171958497655f4d0374b2decbc1429135f7