Merge "Add filter for NoPreloadHolders" am: 88ee5c93bb
am: 202e61f127

Change-Id: Id4967cc4eb918ef81be118d6c03707b4e4e1983e