Merge "Support reading block apexes from system_server"