Merge "Expose Context.NSD_SERVICE"