Merge "Frameworks: Make MockUtils more robust" into pi-dev