Updated mock return values to decorators

Updated the return_value=True/False statements for
mocks to decorators

Change-Id: I4915e11dd4af4776a93d211c4c019213c90c5ff2
Merge "Updated mock return values to decorators"