[automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a
-s ours
am skip reason: subject contains skip directive Change-Id: I1cd6c37cb420674e93b863d21a2b0062d7a355e4
This commit is contained in: