Merge "Fix sample device admin"