[automerger skipped] Import translations. DO NOT MERGE am: 1efb2d97ee -s ours
am: 624edfdec6 -s ours
am skip reason: subject contains skip directive

Change-Id: I96cb557a4da859405a5644d019cd450d40c79822