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

Change-Id: I998f16ffcedc35634b6be174c37cd7bba6d74f24