Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9 am: 9089f867d4
am: 3487a6127d

Change-Id: I078d76688526881bb77766875f8875a8b0a6696f