Merge "[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours am: efec4764b4 -s ours
am: dcad223fb3 -s ours
am skip reason: subject contains skip directive

Change-Id: Id7cf22705c420f2b6a6c0388aac1432d3bdf4401