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

Change-Id: Ia25145f877fd96403022a3c51fc12fb117555f02