Merge "Updated codelock assets" into ics-mr0