[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5
am: fd474f8dc8  -s ours

Change-Id: I81cfcdf20b7c53f16b50d217d231713589c31a5e