Merge "[automerger skipped] Import translations. DO NOT MERGE am: 4712246f85 -s ours am: a0732755c2 -s ours
am: f6bd74a65d -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa40b746aa00c3f29e32f3e4b2c9cefea919f4e5