Merge "Update avc error on ROM 7444346" into sc-dev