[automerger skipped] Import translations. DO NOT MERGE am: 69d02d1457 -s ours am: cb6a52d311 -s ours

am skip reason: subject contains skip directive

Change-Id: I4c4ab5861c4737ad17149961fb23d5951714aec9