Merge "Add filter for NoPreloadHolders"
am: 88ee5c93bb

Change-Id: I4e6b539a4fabf1584673100e48146f22a929f3b3