[automerger skipped] Import translations. DO NOT MERGE am: 8fc40586d7 -s ours
am: c1bfef1d9c -s ours
am skip reason: subject contains skip directive

Change-Id: Id869cebcb896f81e7bbd813337e12a8f19f3a39a