[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5  -s ours am: fcca5bb731  -s ours
am: d18e450922  -s ours

Change-Id: Icb43cc60577ca81ada301f283b9e3e1bf4cf6ccc