am b39b0f32: am faf9a783: merge from open-source master