[automerger skipped] Import translations. DO NOT MERGE am: 1b573525a6  -s ours
am: bbaad92f70  -s ours

Change-Id: I409eb850119e466d71280c881efe1c0ae90eb691