[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404  -s ours am: 519fa54629  -s ours am: 5123593cce  -s ours am: b3ad5ca918  -s ours
am: c42028e0bd  -s ours

Change-Id: Ie480a5b69f3d67b136554dc8038cf523abd29c4c