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

Change-Id: Ic1fb1183ef2c203eee7f52e35f1c33f3c5cb57e6