Merge "Follow framework API additions for mock classes" into lmp-mr1-dev