[automerger skipped] Import translations. DO NOT MERGE am: bb9b24fdcb  -s ours
am: bb5bf3775e  -s ours

Change-Id: Idfa56a35f6c8b6b68b56d857ea3026f2e1aeab5f