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