[automerger skipped] Import translations. DO NOT MERGE am: 822856aea5 -s ours am: 4885137179 -s ours
am: d5eaa706ec -s ours
am skip reason: subject contains skip directive

Change-Id: I6d9d00f1365d837f68f9213c4413d243665e7601