[automerger skipped] Import translations. DO NOT MERGE am: db6ff5d91f -s ours
am: 0d39ad7a18 -s ours
am skip reason: subject contains skip directive

Change-Id: Iedb51b0dae9d613832b1210d36669d3862faf59a