am d6e24ca2: am 4adacd23: merge from open-source master