Merge "Remove preload2 as it is not used" am: c9f969486c am: 321ac12abe
am: 9b511117fb

Change-Id: I1eec6b339f927aaf977d6070f5f64e3a497f3bc9