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

Change-Id: Ib19744d3bc1e4af57e56ebdeaed0436ecf04e49a