[automerger skipped] Import translations. DO NOT MERGE am: 4ea25da221 -s ours am: dc9b7833ae -s ours
am skip reason: subject contains skip directive

Change-Id: Ic76886f22d58595ab03c92f315d6d05a9ea41dd6