TME-Resolved conflict

Fixed changes for cordova reference.