[automerger skipped] Import translations. DO NOT MERGE skipped: aa2d5f7f4c skipped: 693a6388cf am: b291bb2f1f  -s ours am: 00a36cf0ac  -s ours
am: 64fe4bce78  -s ours

Change-Id: I054a4e6c28109074fa4b61b89987f4c6d92d6591