Simplified package replace

Change-Id: I0cbdb3944a55f620019c594d7042ba7374df99bd