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

Change-Id: Ia626e0ab1f8445ad07eaf608c141747ed7eb5a64