[automerger skipped] Import translations. DO NOT MERGE am: 60a5501ecb -s ours am: 1d7f96f795 -s ours
am: fead7653be -s ours
am skip reason: subject contains skip directive

Change-Id: Ieb7e127bca209cfa5e0cd0be892f21741ad3227a