Merge \\"ImageReader: Make close thread safe\\" into nyc-mr1-dev am: 2f8bf1f024
am: 8b29ace33b

Change-Id: I94b195e2a7f43ed010ca3cebe933593c6960cfc6