Merge "Do not preload NoPreloadHolder classes" into pi-dev am: 1af8b4d1f4
am: 55575c8836

Change-Id: Id68bfe966aafebed1ab2da70a1786837698c18a4