am 1331ded8: am e28776bb: am b1110149: merge from open-source master