NFC refactoring

Change-Id: Id239eae364b7e1eddc512acb3516be1c62a726d1