[automerger skipped] Import translations. DO NOT MERGE am: 60ac5859d7 -s ours am: 078563e2ac -s ours
am: 59689c4d35 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie4d776e1be25f35cf12590a8522277ff64022b92