am 056340ac: Merge "stubs"

* commit '056340ac95f233090990d77266d89aad3b60f913':
  stubs