Merge "Merge the framework-defaults into framework-minus-apex"