This is a no-op refactoring. Test: TH Bug: 139774492 Change-Id: Ibb6605a9f7add8319321e5b4960a0b9b637f1434