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

Change-Id: I9b4d9a9ef82cf373eed15cea47dd0a73aacbe56c