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

Change-Id: I84b536b9e12331834feb59bbe3c58b554506f259