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

Change-Id: I116643925a3a9594e8590c3714e93d0fb0ac372f