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

Change-Id: I3a43dc0093dd2fffdb087aeb95464d3864d734d3