[automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours am: cfcf95bd16 -s ours
am: 9cb9d223ea -s ours
am skip reason: subject contains skip directive

Change-Id: Icfe77a9d9fdab4d667f5611615ab3557d9cb32b7