Merge "Update udfps AOD icon" into sc-dev