[automerger skipped] Import translations. DO NOT MERGE am: ed231e940b -s ours am: 41af0c0b2f -s ours
am skip reason: subject contains skip directive

Change-Id: Ieb705d142a8e3b8133143b3ef74de1a2faaea5c2