03ff0f697a
This change is a follow-up to the previous refactor to address the nits. Change-Id: I2a648c581352b9bcaa69f82f08cd06ed8cbfaa85