[automerger skipped] Import translations. DO NOT MERGE am: 4bf388b3de -s ours am: 8b516ca10a -s ours am: 519f025034 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice906bb30208be84231c4a88764a0bf598a9ddf2