[automerger skipped] Import translations. DO NOT MERGE am: 054feb6f41 -s ours am: 56cae52074 -s ours
am: 67d7e97b26 -s ours
am skip reason: subject contains skip directive

Change-Id: If1061a1ccbae514aa2d336aec1ede0f558e7fb65