Merge "Simplify package by using LoadHook instead of mutators" am: 00789cc58b

Change-Id: I897cbf1ab00fbb37b9545ffb9395e55b8e137482