Merge "isFormatSupported() cosmetic changes" into udc-mainline-prod