[automerger skipped] Import translations. DO NOT MERGE
am: 971ceb6e23  -s ours

Change-Id: I581b52548f2dd23522633dbd748aa9aec3214e1e