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

Change-Id: I080a61ac059c393ec108e51d3d39d61a2c3696ff