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

Change-Id: I32edf31026417898cd96833b4fd953e594a55a87