[automerger skipped] Import translations. DO NOT MERGE am: f5518dfcd7 -s ours
am: c1b21b1ef8 -s ours
am skip reason: subject contains skip directive

Change-Id: I4165e227234e9610626fc325fcba67e104b853c6