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

Change-Id: If8cb15b7bf2d5994f7895c9743d8cd0e81f78f6f