[automerger skipped] Import translations. DO NOT MERGE am: 1a2403bd8f  -s ours
am: 537139be50  -s ours

Change-Id: Idff23c609483f5385fa4cd60a6603bbfbda54afa