[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped: a5619cc4e3
am: 19bf5aa466  -s ours

Change-Id: I99a15ef8e43c65f65d99c83c27d8779bbf03f864