Merge "Remove name collisions in java onTransact."
am: a437c497e9

Change-Id: Iece9d17b1b1c5824d0d45914bfda70634ce5f35f