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