[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724
am: ac782db7b2  -s ours

Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61