Merge branch 'fix-image-append-rel' into release

Change-Id: I8233c8cbb425523d774d32032956e767b64524a5
Merge branch 'release'

Change-Id: Ice402567fc1cd085f7eeecb67d61ede4acdcc342