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

Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097