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