am 8f1259be: am b705eea7: am 1bd7597b: merge from open-source master