Merge "GenericSource: restore mLock state in error cases" am: bccd73e209 am: f7f5ab9924
am: 723be42fdb

Change-Id: I2d4c028ed3fc0bb0dd04211947550d3c08674ecf