Merge "Replace new API calls w/ app compat versions" into lmp-mr1-ub-dev