Merge "Small test clean up."
am: 8ca50401f5

Change-Id: I177818b8d1598eb144f5ce76c3a508a71a68728c