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