Merge "Frameworks: Make MockUtils more robust" into pi-dev am: 16e56f7815
am: f0e1e01c44

Change-Id: Icc33d7efbce4663784f9541fb9cee7689ef254be