Merge "Adding onTransact method for testing"