Merge "Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f30 am: c1bcf2ff"