Update to local sources

Change-Id: If3216ac2e498b27ba31ff4c8ad321d11e873d378