Merge "Do not use result receiver for test package"