Merge "Fix a few known issue in sensor framework" into nyc-dev