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

Change-Id: Id888bed48ac77a605fe027e820a27e0cad2c32b5