Merge "Synchronous resource recover mechanism for ISensorEventConnection" into oc-dr1-dev am: 0db05d34 am: 4131f89c Change-Id: I2ecb70e3cee09ab533cff12161e234e62aed7640