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

Change-Id: I60b58f9eb359488be6f3881f8e927131da2caf0e