Merge "[automerger skipped] Import translations. DO NOT MERGE am: aa605a2ff8 -s ours am: 6fa03d4cad -s ours
am: eec9cc07ca -s ours
am skip reason: subject contains skip directive

Change-Id: Id87b7c4a4ed14c3a1810bf409f55442e1e05f4ad