Merge "Adds kennethford@ and lihongyu@ to devicestate package OWNERS" into main