Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev