Review comments to remove tabs and extra spaces.
to incorporate flexmock infrastructure for tests.

Change-Id: I0fe854734d6acc0db455e80b46875a3bf7694bc0
Merge "Review comments to remove tabs and extra spaces. to incorporate flexmock infrastructure for tests."