Merge "Fetch api stubs"
am: c35cb60b33

Change-Id: I1f25a757b21dc79ac02244ecff1da488fd1e3f4e