am e88ae544: am b6f0cbdc: merge from open-source master