Merge \"ImageReader: Add discardFreeBuffers method\" into nyc-mr1-dev
am: b417eb176f

Change-Id: I599785ee3e6d4ae576b5897ff0f62303c1746a79