Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES." am: 7a1ea4e25a am: 385946c3a5
am: 6a646b7bbb

Change-Id: Ie739bc3587560844f60effceb84b6e2595d8a8f8