Merge "Fix hammerhead phone boot on master."