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

Change-Id: I2c12739b6d25ca2767a3d13a15cf5de2fc70b4ee