[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6  -s ours
am: d996012ef5  -s ours

Change-Id: Idcb8df6ed5993f00170408e685080aa525f291e1