Merge "Support Null device account"