am f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master