Merge "Init: error on oneway calls." am: ebae0d3ad9
am: 2a99b2011f

Change-Id: I091bc46e26e638d4b867b933db5a2a7368f7ffd6