Fix how it appears we need to use mock_anything to avoid 'self' errors

Closes-Bug: #1371724

Change-Id: Ie3fdc73924ef99691879ceb5efd9d5d9bb97a836
Merge "Fix how it appears we need to use mock_anything to avoid 'self' errors"