[automerger skipped] Import translations. DO NOT MERGE am: 65d2da7213 -s ours
am: d5d6a49ce8 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d7b809130511015b7b37c75ef93c0d411d5ecdf