[automerger skipped] Import translations. DO NOT MERGE am: 942cf4962a -s ours am: 9fa066742e -s ours
am: d0757b3a6f -s ours
am skip reason: subject contains skip directive

Change-Id: I5d78b953eb00228059ed52c9db3264b024dc5052