Merge "[automerger skipped] Import translations. DO NOT MERGE am: 847cc98a4d -s ours am: 25893a1f9f -s ours
am: 68e9ad973b -s ours
am skip reason: subject contains skip directive

Change-Id: I65aef08a73d2578ad982ab37418dd0050fbd57ca