Merge "Mark Wifi apex updatable" into sc-dev