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

Change-Id: I715f9f2b12d3d0aa3938ed533c972d7da3c2396d