Merge "Update indicator_code lock assets" into ics-mr0