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

Change-Id: I67e025c41b40e97ec11fb11647e477ae05b2981b