Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1