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

Change-Id: Icccd01f87225ec6b2dc3d4dfc006a208771abed1