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