Merge "SF: Shuffle test mocks into subdirs" into pi-dev
am: d3898410e2

Change-Id: I77087350a6709f6cf9fec4cdde2532bd2621c526