am 34cbced9: am d1d9f048: am af232984: cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e