[automerger skipped] Import translations. DO NOT MERGE am: 7435f64406  -s ours
am: 878c6a9d75  -s ours

Change-Id: I37a617e020e32b134fe76dd685cbb6b4c4a6950d