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

Change-Id: I2f56ed1a9393403d46415a12dbe61b3bb45dc72e