Merge "Convert preload list to profile" am: 4ab54e1935
am: 1f7a5e519e

Change-Id: Ia8a88f4eb1f773cfc893d660bf851fa579077e0d