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

Change-Id: I5629702447d41295032c7090575b3a9e90a486b5