[automerger skipped] Import translations. DO NOT MERGE am: 22e2bcd9fc -s ours
am: 37fe8dc347 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic746f8361370b3dfad617c9e8a9f999bd8554f21