Merge "Do not use result receiver for test package"
am: 7e41589cd8

Change-Id: Ie205f7f760d6626bb15abcfcd7261642a102acf7