Updated ios-core with NonConsumableItem changes
Merge branch 'master' into nci_to_ltvg
Merge branch 'nci_to_ltvg'