Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: 8e295ad202" into rvc-d1-dev-plus-aosp