Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours
am: a5c810d4a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I636c33ea04b552a66024e99e1fa337f4808628d7