[automerger skipped] Import translations. DO NOT MERGE am: 5223e55714  -s ours
am: fe98372052  -s ours

Change-Id: Ia7a523f3f12cd60f8f98d28a506f70ef406c2f66