Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: 1f4b32a154 -s ours
am: aaae63aaa9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie5d7634343da300257e1ef469759660ef59ee57e