[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f  -s ours
am: ffe456e49c  -s ours

Change-Id: Ifc2aceed944b28d1a9d923f01eb92ab374d67d6b