[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d  -s ours
am: 2fe6455d18  -s ours

Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0