Merge "Fix system API stub build." into lmp-dev