Android p preview 4
Merge "Fix SEGFAULT in profman"