This should make merging inter code paths easier. Change-Id: I5cb81f25d56fa4790b4e9cfa4bc32b9062c2cfdf