Finish r257779.

PR:	usb/183728