Merge "[automerger skipped] Import translations. DO NOT MERGE am: 59b9b3af0b -s ours am: 2557c8ec83 -s ours am: 30592b127d -s ours
am: 5160618962 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f0d455d68701d5d53108d46e8b306eee2ede534