Merge "mobicore: New branch incorporating QC code review suggestions."