[automerger skipped] Import translations. DO NOT MERGE am: f3dc2c8699 -s ours
am: 79a231ae94 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bb5ac68b5efcaf02e35ecb8546b41fc2a324d2c