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

Change-Id: I52854a78e8f50a4e958241e8a7429109d14748aa