[automerger skipped] Import translations. DO NOT MERGE am: 88a792275e -s ours am: b982d6b7e1 -s ours am: f89dcd2a28 -s ours
am skip reason: subject contains skip directive

Change-Id: I19950fb1bf5f3b0cf8dd4698526491a8e5ca349b