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

Change-Id: Iac24cc24656fc51c0aaa1394f51959d007136a13