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

Change-Id: I6163b17a8415570fd6c610978807986d5cc1cf55