- merge -r15463:15564 from busybox_scratch branch through these changesets: