[automerger skipped] Import translations. DO NOT MERGE am: 4fd9ef399d  -s ours
am: 4275a8eb40  -s ours

Change-Id: I6fcb1786407af4230857c5ee739dbacb17d99ccf