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

Change-Id: Ic455eba7ba8ce089cebc8b3b32af1e1fdedfb919