Merge "Close ParcelFileDesciptor properly" into sc-v2-dev