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

Change-Id: I1ce5a4c80d46736758d5502359de508d1253daa6