Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES." am: 983e7547c2
am: e169824c17

Change-Id: Ic9ee0305b960669340f66546f633a051822c38f4