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

Change-Id: Icd4e4434901eecf0825421291791fc89b14ffea7