[automerger skipped] Import translations. DO NOT MERGE
am: 333844ee5a  -s ours

Change-Id: Ic32371f685009a9ef5bccd4eb46257df0fc42725