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