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

Change-Id: Iabdda565d760e2e875c30cd4b8360ef6444217c8