am 93552de8: Merge "stubs"

* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs