[automerger skipped] Import translations. DO NOT MERGE
am: 7cf227716e  -s ours

Change-Id: I276eacf6bb0ebbf531e033abbd9c5802b10c146c