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

Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9