[581758] Handle removal of ResourceNavigator and friends

Change-Id: I8f236ad51899337da660980fee1f3ba242768dd7
21 files changed