[automerger skipped] Import translations. DO NOT MERGE am: 2906d75c58 -s ours
am: b183639c9c -s ours
am skip reason: subject contains skip directive

Change-Id: Ie368bdfb4ae03a7cbab4a4a9f5173743d1e2adf9