Merge "Code refactoring in ag/5261950"