Merge "Prevent NOT_ENOUGH_DATA from entering HIDL" into pi-dev