Merge "Add overlay for HSUM devices"