Merge "Re-enable testReadFromParcelWithInvalidSampleSize" into nyc-dev