[automerger skipped] Import translations. DO NOT MERGE am: ebb0bbe3f7  -s ours
am: 31398ce165  -s ours

Change-Id: Ib10a86be266ca60ed857134d4402ba33cb040c46