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

Change-Id: Ibbbe116b2fd2a7c7c4d040ef9e630748836f3b3c