[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s ours am: 7c32992183 -s ours
am: 5d448d8d00 -s ours
am skip reason: subject contains skip directive

Change-Id: I21ab64d4db2d63825b92634c8e1ed9e6b0043a1a