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

Change-Id: I3d6e4749aeae39286b21e7fb6021c84cc16c40d2