am 47e0cef8: am 77b9074f: Backport from master. * commit '47e0cef87666634660eef34273875ebd54654862': Backport from master.