Crespo, Crespo 4G and Mako

Change-Id: Ida36aaa8f209df02176faabef1b72f90dee92920