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

Change-Id: I50b9e3bb8363e297d9f4a98dd980c91d46f798a6