Merge "make carrier default app direct boot aware"