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

Change-Id: Iff96dd12f5e8ce6ea3f63d442ca549d78a94eb54