Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev