minor Device - Mastership fixes

Change-Id: Id6d46e22fb67f01cd5c0802cf4fad135a043ec77
3 files changed