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

Change-Id: Ia0fd3cd12967f19af45da4cbd0c08127764ef686