[automerger skipped] Import translations. DO NOT MERGE am: 08cbfd6c12  -s ours
am: 807f0cc862  -s ours

Change-Id: Id90e33b4cff66767241724f8c3396b0776317412