(cherry picked from commit 400ca48456c3aad6572aaa1893ba11466bbad6f5) # Conflicts: # app/src/main/baseline-prof.txt