[automerger skipped] Import translations. DO NOT MERGE am: 275e841c7b -s ours am: ea3d57fbad -s ours
am skip reason: subject contains skip directive

Change-Id: I99e6c0655e21888fb9b080a73c3ba31074d29e4f