[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93
am: 19f08130b1  -s ours

Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c