NFC refactoring

Change-Id: I2cf5d303026287e470cee151ded2744e00268661