Images Replace Finish

Change-Id: I19ea84c6b89c51cfc8efe16cc67abab44884d056