Merge "Update sample NSD app to work reliably with current Android"